Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2011 21:17:47 +0000 (14:17 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2011 21:17:47 +0000 (14:17 -0700)
commita127aab86c09ec8bfa3fc7a8c548fe671c69267e
tree33c1bd98574a2458f42417106b52752e22a9f136
parenta3b83a87a21be9cc6e59b5f707b569e2cdc5f450
parent0e63087c3a8ad133849789c6cd12b65893271895
Merge from trunk.